Merge "Build jsr305 with core_current" am: e51e6c827e
am: 656907bf10

Change-Id: Ia1229c1e63f8c3f74605701a364f983c044321b3