This reduces the code review burden of Android folks. Bug: 194054669 Change-Id: I24ced0e0824c18906f6812e4e69e5e5160154590