Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev am: 0adf6e1981
am: 6b2064e5c6

Change-Id: I113fecfa795bb3921c8187f2ad0032a679bc74ee