am 0ff51b15: Merge "Follow up on CL 123650"

* commit '0ff51b15be8f0baf3bd1bc1f29f2988f297df443':
  Follow up on CL 123650