tree 8c22093ed56fde2969f13c73aee87aea99de05f0
parent 38c06e80f7dcb9a2c211457e3ba5973f3266aea5
parent f26d98e87041e71b00aad88c54e6655ddeef42fd
author android-build-team Robot <android-build-team-robot@google.com> 1559335079 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1559335079 +0000

Merge cherrypicks of [7848027, 7846805, 7847697, 7847517] into qt-c2f2-release

Change-Id: Ic0223aded1eea98f0b868ec4b2c011a8d40e67fa