Merge "Add javadoc about APIs requiring uses-feature" into oc-dev am: 07d2cec982
am: 0cc9c8090d

Change-Id: I2b763f91adfc6f6dc25915f6a41efffdcc44ea42