am c39aae0: Merge change 1278 into donut

Merge commit 'c39aae0ee060b4ff54ba0ab37fd1925ce191f013'

* commit 'c39aae0ee060b4ff54ba0ab37fd1925ce191f013':
  Squashed commit of the following: