Merge commit 'adf210d6' into nougat-mr1-cts-dev am: 48c63657 am: f9181a2e am: 0cab2a17 am: 639a82d4 am: 0425a845 Change-Id: Ieadb84fa9301ac236faec6cbec6a23383e7d3232