am 315c853b: Merge "Make my dreams pretty Bug #7353771" into jb-mr1-dev

* commit '315c853bc69763f1262ae1830fce4ded4edb86d5':
  Make my dreams pretty Bug #7353771