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

Change-Id: I38941bde24946fcfa1598f71d58c1e9b40316974