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

Change-Id: I16c1d5c6c7c31b0c96172f0baaed361eae8f4a5e