Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: Ic3dbc268c2b2f9c860ea21c4308d704df8dba578
BUG: 129345239