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