Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev am: fee443bfab
am: 9d81c54bc8

Change-Id: Iff5a6cb3e48402cf56e1641db4e8fd15d6de7ffb