Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
(cherry picked from commit b7aedc6f3d)
Merged-In: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I8af03136e67057d171e97cb5a43187aa6c7f4fe7
(cherry picked from commit b7aedc6f3d)
Merged-In: I8af03136e67057d171e97cb5a43187aa6c7f4fe7