Merge changes from topic 'am-e324dcd33e36478aab5aff580c25af58' into cw-f-dev am: 436569bea2
am: 40a74fa6bc

Change-Id: Ie8516761608b5c35e9420190c6399284e5236882