e980, encore, hummingbird, p5113

Change-Id: I879f1764336ef3b61b2d668915527d211c7b9994