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

Change-Id: I49709bcca66da1c2985b9d3d018463c330862321