Merge master@5406228 into git_qt-dev-plus-aosp.
am: 87815ae62a

Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2
tree: 119d47617c4874b3dd261b0513e4d2f7f18354fc
  1. framework/
  2. OsuLogin/
  3. OWNERS