Merge changes Id60bc858,I32c4eb53,I5b81fb8f into oc-dr1-dev
am: d1a616761d

Change-Id: Ic149568e7e8dabb4b7bd7db165ea150209a74d6d