am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.

* commit 'fef9dffd96e8bc6f2283a57cd0b29df4be43eb46':
  Follow up to change b638126ed DO NOT MERGE.