Merge branch android10-qpr3-release

Change-Id: I7e968412018feda5d55de69a85fdc660355801f7