See https://android-git.corp.google.com/g/#change,42763 Change-Id: I9929b73db0f6764bb06fbe963e751294a4a787f0