Merge "Avoid using usap when wrap property set." into qt-dev
am: cbd4908c9f

Change-Id: I1a7bc0553a08923ba0ae4a808aede578250a7310