Merge changes from topic "qtaguidReplace" am: 6707ef139d
am: 45eca0a011

Change-Id: Ie4801a92ba6231d3fdabe8435913f7a47c00f3a2