am b6f84589: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'b6f845895decc75e10ee399d1c1addaf38c0a871':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"