[automerger] Merge changes from topic "am-898960ce56d249988f3dbbfe459f5344" into cw-f-dev am: d82f105ee4 am: da883dcfde am: 0546623542
am: 0285bd5f78

Change-Id: I24f091ec34a5f0e5f1243c3f9f00d2468b59a5d6