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

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

Change-Id: I36edb430f576142c95c25755a473a4e21e1de378