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

Change-Id: I57ae6192ab2349e09fc0093648bd31dbb9dfabdf