Merge master@5428150 into git_qt-dev. am: 19dfeca019
am: de477fc699

Change-Id: I7f77083d9d1ba86e00726878c4fede9530ebf438