Merge changes from topic "am-c65d7988-0ca0-4757-9d9c-21f4575eec01" into oc-dev
am: 515700b4fe

Change-Id: I0f58a9fe2bb437e8caf854b4ca8f5c4bc0f10c7d