am 099a9d06: Merge commit \'7d563651aa956c0f9831b7b64be35c2ec790bdec\' into HEAD

* commit '099a9d06ec12006985a71133de289bdd92eb2f3b':
am 060bd97e: Merge commit \'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4\' into HEAD

* commit '060bd97e948fb35b5dd85f734159c37d882af955':
am 711560b6: Merge "Log message spelling correction."

* commit '711560b67b176efdcaa3dfe4e5d8fea13e60f01f':
  Log message spelling correction.
auto-merger: merge in from aosp/master