Merge changes from topic "cp-att-rtt-switch"
am: 3041cd6ae1

Change-Id: I2f16dd73c2ea6e801be8fd6b1a17c1564dcf0619