Merge "Add Annotation" into lollipop-mr1-cts-dev
am: e5db38a409

Change-Id: I8eaf2f8dae3a9ad562cb9d96e2764b1985125c69