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

Change-Id: Ic192d93c989dc0fead68a3ed17cec2ff3d40ca28