Merge into jb-mr1-dev

Change-Id: I821410e9ffcc7148139465c04ef335f0becc18c2