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

Change-Id: I6a15a1b5a97b34fd18f885a0137a8d674b7b6589