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

Change-Id: I590a2bd506f0db8661306fe27d3e6490787915fb