Sometimes, git can get annoying :\

Anyways, picked up some useful commits :)

Change-Id: I6f3b94e1c7683810f5764a89aa310260de41425f