Revert "Squash commits from TripNDroid"

This reverts commit 28f2adc429e9de2b1010036e5d9f28fb25f0de83.

Change-Id: I6430dd33ed1c26607aadc8b23bee6cbb6bd9f000