Merge changes I931dafbb,I845672b2 into oc-mr1-dev
am: 79069b1961

Change-Id: Ie2e0944a40da581365617f31da533736d7842139