cleanup - config_item_str() am: 606c53fb61 am: 246bf88519

Original change: undetermined

Change-Id: I8387a6b2eeb2d4b458810402ab90c6b67093fee9