Reconcile with jb-mr1-release - do not merge

Change-Id: I8c4ba6b279cebcc46d7b7cb71c81f1de96962ca9