Fix build loop am: 643a319eb7
am: 99b40acc67

Change-Id: Icd8c75a6b0e843d39e18fa5fcc0f2718bee27422