Camera Key description

Change-Id: Ic9a22448c16428fc2f311ea813aa2ec5f27493db
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0