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