Bug: 36726183 Test: Builds, call 90 added to policy (cherry picked from commit 3ba8223b) Change-Id: Ib8db1b764ce22aadf8050031d40040dd6c0e669e