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

Change-Id: I689851b43fd7ad2577badd4115571478d1597be3