Merge "Clean up code info table layout" am: ef0a38085c
am: e9f3b717e3

Change-Id: I23dd0f1f27d4df02abd4d0dd1e95dd03e5986503