Merge "Add dependency on android-support-annotations" am: 9f014f67b1
am: b976e999cf

Change-Id: I19c5604bcc7a1181516b88f87645cf671a32a277