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

Change-Id: Ic30e6938ccb02facf186fbb4526e7e085996d62c