Merge "resolve merge conflicts of 52740d0ca097fda52933463cd031c5c3f87d236e to android10-tests-dev" into android10-tests-dev