Merge branch android10-qpr3-release

Change-Id: I5568328dad8980b3621d07152a1a68d78359acfc