Reconcile with jb-mr1-release - do not merge

Change-Id: I7f9cc571e4b476adf19db6878d3c976db0751fd9