Merge changes I52152223,I49db5cab into oc-dr1-dev am: fc596b1cf6
am: d05ac9caf2

Change-Id: I3647f28fef9ebf6195bb057a2abc24598e9e69a4