Merge changes from topic "am-7d1d2840a6074c54a21ecb76cbb1f409" into cw-f-dev
am: 7508147a56

Change-Id: I49b254a913f3f8b43ee0de6a67c589e1cf7e7ca2