* Use show command to support wider platform set * Fix unit tests (cherry picked from commit 95a2140f4b)
95a2140f4b