Merge "Modify testapps for MbmsError and download api"
am: 21205a8aa9

Change-Id: Ic5640b43e99ce87b7d64b111c8ac2f3b928e52e7