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

Change-Id: I3dcd95ac554bc328a17610232554e3718434cfa2