Bug: 195988762
Test: make javac-check
Change-Id: Ifd07672da0141c74ad32613a17691c6cd09e54de
Merged-In: Ifd07672da0141c74ad32613a17691c6cd09e54de
(cherry picked from commit 7512a62755)
Bug: 195988762
Test: make javac-check
Change-Id: Ifd07672da0141c74ad32613a17691c6cd09e54de
Merged-In: Ifd07672da0141c74ad32613a17691c6cd09e54de
(cherry picked from commit 7512a62755)