Merge changes from topic "am-3fd89deb-25c4-471e-8f53-fa39f55c6d0c" into oc-dev am: 47eba14df9 am: 15da634733
am: 463d9b99e4

Change-Id: If3ca9fc11068d33a7c1b410ef999a15658c71927