f78acacb0d
Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149) Bug:2665696 Change-Id: I0a044661ff21ef601ba34782db8acdc9531f98e7