Merge branch android10-qpr2-release

Change-Id: I641d56bc9abcada80bec9b3c5fdf1c02e03eda56