Revert "merge jb-mr2-dev"

This reverts commit 91aa8ea7f94e102d9ab5fa346fbf379821230e3c.

Change-Id: I54ea925a303c62d1e46e28d2720e5819c039872f