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