[automerger skipped] Merge "ApexManager: Request apexservice only when needed" am: d96b6a6823 am: 66c4b034a5 -s ours

am skip reason: Change-Id I2d2173a692ec95a7a35b5a24ca466917e59c1da3 with SHA-1 91baff9782 is in history

Change-Id: Ie51107fb80d858bcaa026be2e113438150db8156