Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into cw-f-dev
am: 71b6110bb4

Change-Id: Ic06c1bc22d4324b2bb757716eda8f04896f71c6c