Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
am: 2c2f8acdab

Change-Id: I89b9c88159f99681049ce401f22ca9ea8578b27c