Fix bugs introduced in a previous patch

Introduced in I2c0bc4ba540886dd196e87a78b205407ad3e866b

Change-Id: I9ff49e7d37c5a1fea8dc8b5659a53697f76320df
2 files changed