Merge changes from topic "am-ee7c6fe117b1402595ddcb16a745b06d" into cw-f-dev
am: 4f314386df

Change-Id: Ic8e1ea6be68075bc03f8fca25890464f1e767886