Merge branch android10-qpr1-release

Change-Id: Iebd3ace62d00613820db5dc1d41a8c142198c9eb