Restore checkerframework annotations am: 73a0dbfcc0
am: 6c3547da30

Change-Id: If988f72eee35bf1b7638e0acb57ac1a0b57105e8