Reverts files deleted incorrectly in ag/11570083. am: 9d2d90eaf6 am: c90e4c0110 am: daf71d8feb

Change-Id: Id92b3d1da6e7ad6a65c8ed850471109e5e05977f