Fix double strings derp

Change-Id: Ibea99ae68e75e3a6638c553fa52cdb5d0b2319ff
Fix Derp

Change-Id: I8a5313a63affeb91788995f78ec89b129a0c7167
Fix another merging derp

Change-Id: I9984833a62c809fc45678c4bf62d74ac0bee1320