Merge into jb-mr1-dev

Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae