Merge changes from topic "am-487b3a4e-6c35-49a5-a21b-805401f2196b" into cw-f-dev am: 2a139ea31b am: c3b99517fd am: 1542904855
am: 72c4ae12cd

Change-Id: I1a9be0f0ce38bd7e3e0230d9869063490695eb2f