* Now that we have more than 1 device using these apps there's no reason to have them in separate trees. Change-Id: Ie5a969f2d40506a330eb721f7702424f1f9f087b