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

Change-Id: Icca522245fae8ed923ce536d9cc9133d994bdd73