Bug: 79597307 Change-Id: I79c5115f08b0d3f684eb38efe00a751f363ed965
mentioned in commit 6efe210c
mentioned in commit 27623da3