Test: builds Bug: 80132328 Change-Id: I5cd32669b0cb23a1be29e6c56f66af7f67b82fe4 Merged-In: I5cd32669b0cb23a1be29e6c56f66af7f67b82fe4 (cherry picked from commit 561cf897)