Switched to mine AE branch

Change-Id: I6a323be1530ff58b86b26984f78fea9882ba71c8