am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been...
am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
* commit '11473332':
MtpServer: Do not attempt to stop MTP if it has not been started