Bug 838844 - Fix nits in droid changes;r=gbrown