Merge changes I20bdab1b,Id82f9081 into oc-dev
am: 64b044680c

Change-Id: I6bf7127bd9f46855e186e13fc4e06f27535c4916