Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""

This reverts commit 67f28e7448d41d6affde43e3f1fcb366cc5cc82f.

Reason for revert: Testing fix for b/191191441

Bug: 191191441
Change-Id: I15ca686c7c44626b734ba45e785adbe66fcf624a
(cherry picked from commit 32eef1d5803b968fe9189f786ccb4898f3818d04)
1 file changed