Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev