Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev am: 4244190788
am: 61ea78238e

Change-Id: I0b4af47df7862451ba65246b232459d37441c837