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

Change-Id: I7e80c400ac37290cd3c44fcc4a9abb05c71f96bc