Merge "Mark ACTION_LINE1_NUMBER_ERROR_DETECTED as protected." am: faa8b9a4dd
am: e7d5c2ab21

Change-Id: I86a7a6bacf6c850ee718cf465b7fe50003da6b8c