Merge into jb-mr1-dev

Change-Id: Ic10d3201218c7045e03e563996ac04239c75b52c