Reconcile with jb-mr1-release - do not merge

Change-Id: Ia20655ab55dfad2480f8b9da1f04f2068deee01c