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

Change-Id: I25544be935b5ea9f2413e923e496a39beca45aa3