Merge "Support Background Service Limitations." am: a0f863d4fb am: b747134254
am: 7f0e5de1a3

Change-Id: Ie5cc9948a7538a8fedcf645a9d419fb74cc9bc3b