Bug: 79597307 Change-Id: Ic77c259b54d1ab2db088d07a54beba74a3840ca0
mentioned in commit 67b839d2
mentioned in commit 150803ae