Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am: 8b047ec8a2
am: 245cc0559f

Change-Id: I904c603cf4838f12067b9548058b85e53a843fd0