Merge changes I28f7ac47,If075675e into oc-dev
am: 4f5c38b357

Change-Id: I21d7ad41247bf36fdc7209dbe6f2b26a86cdd26b