Merge "Be quiet" into qt-dev
am: 6297eced24

Change-Id: I7891af97193daf87e6537eaf316ec95edfbf5261