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

Change-Id: I14259c8d36028440323f940e212c9099a62a6c87