Reconcile with jb-mr1-release - do not merge

Change-Id: Ib099b57a16a13bb5d7b4785b547146130e67109d