Reconcile with jb-mr1-release - do not merge

Change-Id: Ie51406251152692347f738883ae33a9ba62435fb