Bug: 79597307 Change-Id: I6d4692893cd335d7d5089764977adfe18e054431
mentioned in commit 021ed7dc
mentioned in commit ffb75bf5