am fa716c7b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev

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