Merge branch android10-qpr3-release

Change-Id: I547bcaa33411ddc26dbb37f9aa20fdf5c54c4b10