This was probably wasn't done in commit be3f8f14 Change-Id: I37ccb8ccd1a1b4ea9f523d9f5ad93ea26a709636
be3f8f14