Reconcile with jb-mr1-release - do not merge

Change-Id: I7663718d128bb09e7366d9d375f823fb684c7d59