Identical to https://android-git.corp.google.com/g/#change,117828 which was reverted since its collaborative CL broke the build. Change-Id: I5fa7d3e9b6026639bf72530ff5b449e36f802914
Identical to https://android-git.corp.google.com/g/#change,117828 which was reverted since its collaborative CL broke the build. Change-Id: I5fa7d3e9b6026639bf72530ff5b449e36f802914