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

Change-Id: I34613d4e53c6cc33029e1f8030b0605100cc59fc