Merge "Don't invent our own pagemap constants." am: 5079d0aabc am: cb060d9bfb am: 4bfe8527cd
am: 8fdb71539b

Change-Id: I94992d65e0d8ba530ae1b11a9e6fd8b3a54680d4