Reconcile with jb-mr1-release - do not merge

Change-Id: Ie6ab54e92b8261bc8b2fb8819e73631237a04e84