Build: Squashed commit to make the rom build

Change-Id: I5c013874813b5cf9253a738b2a63830a490f0f30