am 9d8557c4: Squashed commit of the following:

Merge commit '9d8557c4b3156672b9177cab9d97701d85363836'

* commit '9d8557c4b3156672b9177cab9d97701d85363836':
  Squashed commit of the following: