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

Change-Id: Ic36e27c7200105727310dca7f58b5928b5870348