Merge "Make system item has a consistent name." into oc-mr1-dev am: 9a3cb9b835
am: 52a2d32a37

Change-Id: I420581233b77c88772058730e8535c8d72b2cad5