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

Change-Id: I330d8b7379a5a5f26283b79b44e809019d091195