Merge "Add class comment to avoid extending ServiceState class." am: f0a67227c4 am: 0b0d934919
am: 2315621839

Change-Id: Ifdf2427161abde18695ee9575032af3db9ca308e