Merge branch android10-qpr2-release

Change-Id: I6b49f672fc82bc5870e99c3aa7cd5f9b5e7b0bc3