Merge "mapper: support new usage and format" into qt-dev
am: 605a9f4da6

Change-Id: Iea4caad822c633bc33cc120106d98c699f0bb2f8