Merge branch android10-qpr3-release

Change-Id: I04218cf65383f2d9fcf059ffa282f392d1bc03a8