Merge commit 'adf210d6' into nougat-mr1-cts-dev am: 48c63657 am: f9181a2e am: 0cab2a17 Change-Id: Ic542a2fdcdd0ac8b4408c74fbf60324e629cc699