am bf1fa2cc: Follow up on CL 151605

* commit 'bf1fa2ccb5e7409910b99dc46b616e44c66ade68':
  Follow up on CL 151605