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

Change-Id: I3f7e0c45172e486819032e1320598993fdf0b415