Merge "[automerger skipped] Move service initialization am: 937cc90b -s ours...

Merge "[automerger skipped] Move service initialization am: 937cc90b -s ours am: ea157264 -s ours am: e00b1837 -s ours am: b05172b1 -s ours am: 796b8b0f -s ours" into tm-qpr-dev-plus-aosp