Merge "Add @NonNull annotations to LE CoC APIs" am: 8b57ab7989 am: 68e00291e0
am: f36e4f26a4

Change-Id: I674f926ff2822d311fd6f6a0cbf061a2e815b093