Add jfltespr

Change-Id: If4c25f6802e9137bd684f08b6ec5389c3ed03eff
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1