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

Change-Id: Ie396445c41942ab6bbeaf35c504a3be004d5e473