a9 for compatibility with intentionally broken build guts

Change-Id: Ia9cc088e49d737e767d703218718650f6a77f552