Merge "Merge "Merge "Add Annotation" into lollipop-mr1-cts-dev am: e5db38a409" into marshmallow-cts-dev am: 8272dc0854" into nougat-cts-dev
am: c872372a9d

Change-Id: I0b122081fe3e721852bae500479cd41cfd43cd62