am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in...
am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev
* commit 'aa3ac463':
DO NOT MERGE Protect against NPE in FusionEngine.java.