Merge branch android10-qpr2-release

Change-Id: I2a64652069bd82791bb9c6fd40c2ef2c4da83bf2