am fc5489a0: am 07ab4ec9: Merge "Follow up on CL 122665."

* commit 'fc5489a098e251493b32059781199ebc454b3c6c':
  Follow up on CL 122665.