Based on git shortlog and my memory. Bug: N/A Test: N/A Change-Id: I2e821a1214c349fd75f2971f632de3d30c602b83