Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev
am: f512575c68

Change-Id: I590a658c92ad271c7b4f18f5768c1a4e581ffe94