I wanted to make this change before pushing the last patch but forgot to amend before pushing. Change-Id: I8e1f03ee0131c1e75973718e7835b39580a06054