Merge changes from topic "qtaguidReplace"
am: 6707ef139d

Change-Id: I2d55815030878d871d585e956f4a82623e64b12a