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

Change-Id: Ib1cbe723f930e2f7a4ee428027a0ee9e755400d1