Fix previous commit

Change-Id: I2f3bb2e85457356a0e1ca313f3988eec40f362e7