FireDroid features 2

Change-Id: I980ac88f34d5727626b84d87f60f02c70c6b590e
Path fix

Change-Id: I2f97d8e21d746c582304fa09e7096633fe303260