Re-do Ia29aba6762692f70bd63e07e9eac67c07e477878 after I borked the rebase

Change-Id: Ic13e1489abd119017ab9fa84aaf9411f40c87026