Merge changes from topic "am-793ae1d1-008c-4cc0-9717-ce9555544b26" into oc-dev
am: 6df241a03e

Change-Id: I86c0ecb695b09c77e06af66afee1ebc48a9453e7