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

Change-Id: Ia7cc8c0bdd2c513d969ea29c2de55797f9c7e035