Merge branch android10-qpr1-release

Change-Id: I0c5e70ec73b2cff33a67d8a4abf17be702d181a9