Merge "RTT changes for ignoring user-set setting" into qt-r1-dev
am: 24b06bbc0f

Change-Id: Ie4f4e268fb279650de1d2a296810c4b53235c232