Merge into jb-mr1-dev

Change-Id: Ifc2328e30a52c2baebc1322c9b161104dcf21618