am d3859994: am 951ce6c9: Merge "Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597." into jb-mr2-dev

* commit 'd3859994624af39e0f75fd70fe623403f38c408d':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.