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

Change-Id: I0dfdcb0cee426f5f81bd65a2b465c6f216017237