Merge "Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 1c26d74db1
am: 9c8f9bbfa9

Change-Id: Idf7da3f814b9fc877165504ecedcf834c22619fb