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

Change-Id: I402093ceabffe08087ca1cbc851fff3f58f327b5