[automerger skipped] RTT changes for ignoring user-set setting am: 6a06be66aa
am: 40d708ba1c -s ours
am skip reason: change_id I8039ba8061b83e315af7fb7007253978f9544100 with SHA1 f2daa02a7c is in history

Change-Id: I1617f92d15dc747edce5c02245ee25634936300d