Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev
am: d82f105ee4

Change-Id: Ibdaf2181549e6ee0a3a192e0c0ae527fd6258d91