[automerger skipped] Merge "procrank: do not keep process maps around" into qt-dev
am: 1040109071 -s ours
am skip reason: change_id Ib7bf960ed1d053347fcfc0c8aee9019607a1eb01 with SHA1 a42207e2e3 is in history

Change-Id: I9160f043b36329099ec19ca1ab1e6fae515c025c