Merge "Removes obsolete alpha modifications" into qt-dev
am: a96c11d043

Change-Id: I39dea8a6cf066876a5351aa9f2fd26607dc91212