[automerger skipped] Merge "class_start_post_data also starts disabled services." am: 68b378f980
am: f4249b0f38 -s ours
am skip reason: change_id I1e81e2c8e0ab2782150073d74e50e4cd734af7b9 with SHA1 ebce675b17 is in history

Change-Id: Iecb9f8d50dba5ea9d13da8d878a2e5547c92f0a2