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