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

Change-Id: Idc140c2c05c63afb189d421f1e88197619cabaa7