Merge "Merge changes from topic "63974989" into nougat-mr1-cts-dev am: 0ca6758a91"