Unifying icon loading methods

Bug: 183641907
Test: Presubmit
Change-Id: I255e81a128635910b531b3d00f707fa352050f2e
1 file changed