am 6e43ee67: (-s ours) am fa716c7b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev

* commit '6e43ee6796795840819843e2693f6f3622638208':
  BUG 5457035 : Anti-spoofing : DO NOT MERGE