Merge "Change tools:list_item to listitem." into mnc-dev