Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev am: 0ddaa63b67  -s ours
am: 3eda5f4fe8  -s ours

Change-Id: I9eadb28fed6d9e1e7dda322467508449ac12bd59