am c148e7a6: Merge "Squashed commit of the following:" into jb-mr2-dev

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