Set a few dependencies / clean up strings a bit too

Change-Id: I8167cf97e071e64cf4c2e6958214ec8adc72201b
Merge "Set a few dependencies / clean up strings a bit too" into du44