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

Change-Id: I53f12c1d0854d56ad0e700bf028fd68b47917e1f