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