Follow-up to 71c51023. Required because of a6cc361e. Bug: 30150688 Test: m Change-Id: I68e8951c354a1f590040bffb0259198cf80ae463