Also, a small typo bug is corrected in cidr2iface. Change-Id: I2e41ea8e6b7d80333b18cffab31b277497511ba2