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

Change-Id: I513400da5ceef530e70a047a58d640d2f9897770