Merge changes I8953967a,If17eddad into oc-dev am: b8abd8d867
am: 68da249054

Change-Id: I4765886cec83980a59000a077e927cb480420e3c