Merge "Support Background Service Limitations."
am: a0f863d4fb

Change-Id: I9adaa11f83492d5e09d19ded088deb7119bcdade