Merge "Fix TestSizeAnnotationCheck check." am: 6e67840e5c am: dd6af187dc
am: ae605f3037  -s ours

Change-Id: If257685e5ac3d678bba692d14c305ddc82892e68