Merge changes from topic "remap-code" into qt-r1-dev
am: 1d0d34348c

Change-Id: I3691ed2a60524d2147da2ef6e5ad13b44801f424