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

Change-Id: I2c4155b87382525a1d25453444a82c0ddeee496c