Merge "Modify testapps for MbmsError and download api" am: 21205a8aa9 am: 88006c80e0 am: 5fe5bd8e44
am: 699dbe1d08

Change-Id: I4cf6b63fa212c4dd3ec81c68f06d4f2089e01c2c