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

Change-Id: I48bce01e484cae7d3f4ba764f65c242be30b4336