Merge commit 'adf210d654c19c51ab0fdd7e7b20d7864201134f' into nougat-mr1-cts-dev am: 48c636578a
am: f9181a2e77

Change-Id: I46ffea21cccb896ef17d8434b009db263ba70e6e