Merge branch android10-qpr3-release

Change-Id: Ia18950c5e7a42e9bc8fc022cb9025ce022ca6393