Bug: 217448211
Test: make -j
Merged-In: I0a76275baf2c80894b6be71d79b3265021ac921b
Change-Id: I0a76275baf2c80894b6be71d79b3265021ac921b