Merge remote-tracking branch 'goog/lmp-mr1-dev-plus-aosp' into lmp-mr1-ub-dev