Merge changes I644e25fc,I934509c7 into oc-mr1-dev
am: feb2833644

Change-Id: I35ec62cff3fae80ee305c1bc8c04b9a52d95062b