Merge "Re-make showmap host supported"
am: 856544f8b1

Change-Id: I12d9efe3c3506ec5645e8348fb8ee17dc7481582