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

Change-Id: I0462c285246e6c281b1f81680b1b0d4a11ca7be0