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

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

Change-Id: I9985b54c1149c4d44143026eb97fc130d0e8bd10