Merge changes Ia4eb5378,I745031b8 into oc-dev am: 78fed232ae
am: bf56e45b7e

Change-Id: I91473188d8a50b7c1a24aefadd32a377b00de036