Merge "procrank: fix bounds check to prevent heap overflow" am: 79dcfb73a2
am: b11c7eb720

Change-Id: I29a9ea016d766c0d93a8361787532ab96ba4f0c3