Merge "Revert changes to Call.java" into master-nova