Reconcile with jb-mr1-release - do not merge

Change-Id: I9082ae83604084d7999efcc4929bccfa34cb3765