Merge changes from topic "63974989" into nougat-mr1-cts-dev am: 0ca6758a91 am: 9963311eb3 am: 4061c6c798 am: 8606dcca96 am: 1394c50000
am: fc508cfba4

Change-Id: I1da43b9f68c1749141098e4393b57fb6a118a65e