Merge changes I4a4aad3a,I40b94919 into oc-mr1-dev am: 97d9efb4e0
am: 089b8813c2

Change-Id: Ia483bc7bc7988792b28826958fd759c9d27276bf