Reconcile with jb-mr1-release - do not merge

Change-Id: I91572ae0a96d0f7450b8afff1b32167c8dd0c086