Merge changes I12d46493,I0ed00441,I55e5dc5a,If61296ff into oc-mr1-dev
am: c03127ef5c

Change-Id: I513e8af7c137166a7cd2094f464605bba2618dba