Merge "Add NonNull in Carriers constant" am: 40c918b924
am: 2c9b7a4a2f

Change-Id: I06136ab9434fbc89fbbaaf99995469dcf34050e0