Merge into jb-mr1-dev

Change-Id: Ia9c5e2295fe61ae0f5275d3ddfd056d9778b66d1