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

Change-Id: I8db3d2899a563503064f5c811c30785967eaceba