Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev am: 14676c5da4
am: b7de1a86b5

Change-Id: I1797f0c7ad3ddd7d6f509c093f9a16f007a7fe5d