Merge "resubmit reverted CL https://android-git.corp.google.com/g/#change,42682"