Merge branch android10-qpr2-release

Change-Id: Id04497f9adc46724e72757d5c281a3ddade2dd5f