[automerger skipped] Merge "Do not erase system_other if zero length." into rvc-dev am: 46aa61ec59 am: 887305edfb -s ours

am skip reason: Change-Id I20778a8965526beb7ece1d79100646e770d0aa2e with SHA-1 64331b37cb is in history

Change-Id: If2c4284a3f503bd15a67156a473846773215f328