Fix apt for new release
And clean string substitution Oo

Change-Id: I6a1aa3f2b7ef876644743df4a0157e4dd91e597c