Properly switching to native systemd service files is too intrusive for these services at this point of the release cycle. Let's use this hack for now, and then convert these to the serveral .service, and .mount units required. Change-Id: I8f66bfd8be5924232bf2c34d42b18d2a332db3eechanges/41/20541/1