Reconcile with jb-mr1-release - do not merge

Change-Id: I78f2650f276afe5ec7b3c81baa7957b526de2569