Merge "am: do not account totalSwapPss as used RAM" into nyc-dev