Merge into jb-mr1-dev

Change-Id: I22fd779623397332e493f71ac718b972e1e1dad7