Merge "Add Annotation" into lollipop-mr1-cts-dev