Merge changes Id4647e54,I66b6edbd into oc-dr1-dev
am: bf72631a10

Change-Id: Ib1f5d7cc4841124c4f5fc1ea543ce3984dc26d16