Reconcile with jb-mr1-release - do not merge

Change-Id: Ic61db28563308c2da38d7b2c2c12e0486914ea17