We need to override this. This is the upstream version unmodified. Change-Id: Iec3a22595a2f1f802922c22e883c4d63859c3886