Merge branch android10-qpr2-release

Change-Id: I3b1c2c4fe73314b4a4c78f0659ae689ce0613fff