Added a few dependencies/string changes

Change-Id: Ibd5ddf039937892f348e59393951e01d2eea136a