Reconcile with jb-mr1-release - do not merge

Change-Id: I5d92da8a0dae14bcd6a61f1e015f818d25066763