Merge master@5428150 into git_qt-dev-plus-aosp.
am: f998b55aad

Change-Id: Ib3160f6e379f99fc476621990ed97aea69277e50