Final build fix

Change-Id: Icd39b24430d2146c8d2a22afbfb5b394a9ee8baf