Merge branch android10-qpr3-release

Change-Id: I4437c2a8a26edf2b315b28595e28c07ffa68f1eb