Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev
am: 3bbe3c7c93

Change-Id: I15050b23d75c15ca69d1aeadddef4f8f955276ef