Merge "procmem2: Finish implementing all options" am: 16aeee42b1 am: f293e58a89
am: 5ae7e8eabd

Change-Id: I47d883f5f887768764e0785379b74c4ed0e442e8