Forgot to commit this back around the time I did the manual Change-Id: I8fafeec5105b4bee3380779f4cc86d3e73459cf2