Merge "class_start_post_data also starts disabled services."
am: 68b378f980

Change-Id: Ie4700679ebb86a076f0b25b6282092353583aa67