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

Change-Id: Ic542a2fdcdd0ac8b4408c74fbf60324e629cc699