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

Change-Id: I6141057b8737a8b6adb9d4fe00fd350369d55c42