Make ordereddict optional

Change-Id: I73d6eccb25bf6d72471b9b23b537a8041e131b20