Merge changes from topic "am-00ffb4de-7aa5-42a4-ba5d-b45278438ff9" into oc-dev am: 283b2bdbd9 am: 48a2b53c5f
am: 298436fea8

Change-Id: Ic65e11348923c535a7518ed70992dddea105e03c