Merge changes from topic "am-d64fee57-22e8-4094-8534-a29521e0f487" into oc-dev am: 3c414157dc
am: 75c2e2fdd0

Change-Id: I061598c0ca5d921168b4830b86f6b289464da593