Merge changes If4271719,I9c9b5de9,I46a26a67 into oc-dr1-dev
am: ddd9c71272

Change-Id: I842bfeea8bea812f2ff2adb87387fc129bcb68c3