1eec532a8e
Exempt-From-Owner-Approval: exact cherry-pick from already approved master CL. Test: compile Bug: 156757711 Merged-In: I330b8cc5aeb14ebcc15fb88c605ac72770497040 Change-Id: I330b8cc5aeb14ebcc15fb88c605ac72770497040 (cherry picked from commit 9b9235981c880a25367604279c4673df71b1a578)