Merge branch android10-qpr3-release

Change-Id: I0b04c1b2b0dfaabbf6e029dd907b8e7b0f094ace