Merge changes I52c156ed,I9fb9a924 into oc-dev am: e3c0b02d33
am: 4cf0bfe0b7

Change-Id: Ia997632e063c132f5acc7c0548181979b125ad21