Forgot to do a commit --amend with this fix before pushing Change-Id: I7f2e4bead7c85b9edbf13992f15c3b93c2b18197