Merge "Do not erase system_other if zero length." into rvc-dev am: 46aa61ec59 am: 887305edfb

Change-Id: Ia5817b3a2aedb949e61da715671c4d20c7a6e700