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

Change-Id: If0de3820ab36ddeaeb57d332f332a84963c8ad5d