8d7cfd1d36
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I095a1da30766e4b4eab33f42b034601b3322eb3d
(cherry picked from commit e210b47c20)
Merged-In: I095a1da30766e4b4eab33f42b034601b3322eb3d