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

Change-Id: Ibe767b5bd21ed75ea188a1a6561aa974edd2b449