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

Change-Id: Ib7cf020e807ffb3af91e5c07f9e1b180f7ceeaae