[automerger skipped] Merge "Mark ACTION_LINE1_NUMBER_ERROR_DETECTED as protected." am: faa8b9a4dd am: e7d5c2ab21
am: 204bdc5e55  -s ours

Change-Id: I08b03d9959fabb919a3085827fa5843b500eabce