Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
am: 3315f38c3f

Change-Id: I7f8bfe688afc95a184fc6499b95a3c733cb9c681