This could be a bad idea :D

Full reconcile with CM in this folder only

Change-Id: I8e31dd966dfbd54fc8a89305c1b31bdd208754fe