Merge changes from topic "b152482542-step-three" am: daf792aac4 am: 12d2712a46 am: be63a20075 am: fe2cc08ccf am: 5486b3c080

Change-Id: I6a2ea99d575f49b7a96d63d721f1b554feff46bd