Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev am: d59b0eddae am: 3f2dbb7cc9
am: e934ea80a6

Change-Id: I17aa86fa2a02f1a80e9ec8aaa557c3488dd32c21