[automerger skipped] Merge changes from topic "cp-att-rtt-switch" am: 3041cd6ae1
am: 03f0859f85 -s ours
am skip reason: change_id Ica8c6a0a9634611a82c208d59040dd7a3c95b3fc with SHA1 b574d5f303 is in history

Change-Id: I8b24d60059ae9365b0106bbb23dec72791ab1c80