Remove lodash dependency

Change-Id: Ic5e80fcbcdce25d84199ca19d7e4fd7c0d4c464b