am 53126416: DO NOT MERGE!

* commit '531264164a2cd24fa412b71782ef424a2d968028':
  DO NOT MERGE!