Added Javadoc for storage classes. Renamed parameter.

Change-Id: I71b348185442d4ffc5dc5657a627ebb1cd6fcdf9
Merge "Added Javadoc for storage classes. Renamed parameter." into develop