Merge remote-tracking branch \'origin/stage-aosp-master\' into mnc-dr-dev-plus-aosp
automerge: 7df367f

* commit '7df367fe4813e15865fbfab2bea29577f64dd85f':