Merge "ApexManager: Request apexservice only when needed" am: d96b6a6823

Change-Id: If80283b5cb9e479fcfa8c4fdea21fa2da03266bc