am 6c6a7012: am 5aec09b5: am 9a741915: Merge "Add annotations to the sdk build."

* commit '6c6a7012ad0e77518f8aea9e2a70c830c67e99dc':
  Add annotations to the sdk build.