f93544c58c
This reverts commit ba25fd9523.
Bug: 399037701
Flag: EXEMPT bugfix
Change-Id: Ifda203670c3273ce28fc6522f08cca830da95957