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

Change-Id: I014873b33788ed6154e06d45d8f8177a5028e973