Merge "Make state atom field annotation name consistent between google3 and android."