Reconcile with jb-mr1-release - do not merge

Change-Id: I3204ba274a24f88cf9886569f898880e9c758290