am 1d8941b6: am c575e007: Merge "setShowGTalkServiceStatus() is deprecated but...
am 1d8941b6: am c575e007: Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev
* commit '1d8941b6':
setShowGTalkServiceStatus() is deprecated but tested by CTS