Merge branch android10-qpr3-release

Change-Id: I3098b9bfca5c444c983d7abc9b45e533b50f0982