Merge branch android10-qpr1-release

Change-Id: I57c0ddc5daaed0a41b707b69261455eb6c164b67