Merge changes I901908d9,Iac9835ad into oc-dr1-dev
am: 47aac56746

Change-Id: I902d2775b0a94e65b1c05e5c551ecf590c74e48f