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

Change-Id: I6e38561883d6a898cb0a719d10b6f2726a947354