Merge "Add SystemApi and NonNull annotation"
am: 79ca88e3b5

Change-Id: Id11ab9f5b4d0ad2623bfa09aea47c2628c133b03