Reconcile with jb-mr1-release - do not merge

Change-Id: Ie34407add6de1a599529f03ac8954c792c400fbe