Merge \\"Merge \\\"Include new constant for encryption status in the...
Merge \\"Merge \\\"Include new constant for encryption status in the getter\\\'s javadoc\\\" into nyc-dev am: e278cf76\\" into nyc-mr1-dev am: d2e6a628
am: b493ce83
Change-Id: I10fdd234351c534269187c0e1fb2d8745be51b54