Reconcile with jb-mr1-release - do not merge

Change-Id: I9de953cb5d49ea43902882573b01bc91f74d4953