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

Change-Id: Ifb20705f8e58acf35af7ce9c665e8f006c48c889