Merge "class_start_post_data also starts disabled services." into qt-dev
am: 5ff7c4b22d

Change-Id: I2254666031fd7c6e0b5e3a130feed18b09ca61f4