Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev am: b6b6c01847 am: bdc573b39b
am: d258da6a80

Change-Id: Ifdaae4a751661cde4019835e067c6516c3d64599