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