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

Change-Id: Ib0ea06015fa9c680eebefba5ea3434b3c8f44eb7