Also moved _safe_int_cast and fixed the de_camel_case function Change-Id: I675f1e0911d21a6603164e77ce02c9d8d130ae40