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

Change-Id: Id55bf0c3805c5fc0eb853b9f60616f42bab71c27