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

Change-Id: Ib580e3d67747a24f85c5d801e8f4129d1c5a7ab6