Merge changes from topic "146593004"
am: 3863c17fd2

Change-Id: Iee15532f5e91ed2d18d17a957e28020cbe12494c