Merge changes I9047b298,Id9554d6b into oc-dr1-dev am: e6ffd49479
am: e241cbaa7d

Change-Id: I29e56cb95b74097c70ba19cc356472ee06e2fac1