Merge "init: hack for /charger symlink" am: 94f476b01e
am: b51dc8907d

Change-Id: I94756ce28f656f945cdc7d8f6bdf93984b261286