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

* commit '951ce6c966311d36328a89784d4c2e6836e9ae87':
  Revert change f449c0c381239dc0f78b0f01ecfb3889e056a597.