Merge "Add missing override keyword"
am: 8a1fb91e14

Change-Id: I830ffece013b56785a26f6b5463c401fb66a2eb1