Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev
am: ef0d8b4472

Change-Id: Ie4cdce55a83a00f2ceac184cbc858b7fa4deddcb