Merge "Add swapPSS support to showmap" am: c8deb72c58 am: a9a1e59a84
am: 5c3b12a162

Change-Id: I5c1373dd26f0782866826291e152afdd129df5f7