Merge "Snap for 5927222 from ecb12313bfd83b64876468f7a1cfda5763c13734 to android10-tests-release" into android10-tests-release