Merge "Unhide the LE CoC APIs" am: 0677766615 am: ac723d7d62
am: af4189b8fa

Change-Id: I56f67e9e381c2ebe009405cf32bb78ed0ee50acd