Merge "Revert submission" into qt-qpr1-dev
am: 2a1f9ba95b

Change-Id: Id444c3a9c767de5144ee2ded8f4c1cabca304670
tree: e753a09974d5611ced97a6ade2412fb098c955f9
  1. framework/
  2. OsuLogin/
  3. OWNERS