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