Merge "Set -Xdoclint:none" am: d49e55561a
am: 401aae0783

* commit '401aae078359c0b3a5f722dea761ce45a911e405':
  Set -Xdoclint:none