Merge "Do not allow capability discovery until user opt-in occurs" am: afb4ab98cc

Change-Id: Ic8d1c9d244ccd41ba47a67fa7bef114e19838695