Merge "Delete "Show CPU usage"" into nyc-mr1-dev
am: ab7a44b41a

Change-Id: I630373a09d4929dd01dd76d5d3fd16289c5dbdee