Merge "resolve merge conflicts of e30e3430f936 to oc-mr1-dev-plus-aosp am: 6dadd3e441"