Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
am: 54f40fa1e6

Change-Id: I908fe0868bbc85b959e9d41afa709019669131da