Change-Id: I101f970904251a7176b68eef5fa225cb2b66ff22 Auto-generated-cl: translation import
mentioned in commit 325232e3
mentioned in commit 4c788039