am 3f36b33d: am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev

* commit '3f36b33dca0c1c9599c81b273e88b85d0e6fb06e':
  Document the order of values returned by keyAt().