am 31a7869d: am 96464512: Follow-up to Ie62a4486

* commit '31a7869dca3484477507254e3708b5beedec251c':
  Follow-up to Ie62a4486