Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev
am: c3b4881ea5

Change-Id: Ia58465b88ef5334753094719f4fdbb175b423f24