Merge "No need to fake P->Q upgrade anymore" into qt-dev
am: a1eb76aca1

Change-Id: Ia0875bb7fd19e69bf84fed67b997fe8302b11607