Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225 am: 12835665f3
am: 3fab85bffd

Change-Id: Ibc6404d2b900f9f70b38c152a62d4609aeeb4d96