Also added missing final and @Override keywords Bug: 17199815 Change-Id: If96554e36799557a2d81767f287aeb446e4a1983