Bug: 79597307 Change-Id: I67d99e171885199c264c3139e9b976ec5efe085d
mentioned in commit 457f42c0
mentioned in commit f195cdd1