am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.

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