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

Change-Id: I7beb9f82d2501f803fac2a3ff5248b4d72e7bcfd