Merge "Add @NonNull annotatation to Account.java"