Merge branch android10-qpr1-release

Change-Id: Icf5ff6b706cbc8ae83de09f7e3c0952afe890539