Reconcile with jb-mr1-release - do not merge

Change-Id: Ia7b7c100de95222217ba6afa181fa449818b13a5