Bug: 64692907 Test: None Change-Id: I407e97081edcfb34282920722163b7f499ee0bfd
mentioned in commit 569ab5e1
mentioned in commit 893514e4