Merge into jb-mr1-dev

Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732