Bug: 79597307 Change-Id: If1e4a965391c10a6b0daf1519c4abb36de703753
mentioned in commit 1baf3e56
mentioned in commit ee21fa11