Reverts files deleted incorrectly in ag/11570083. am: 9d2d90eaf6 am: a7157ccc06 am: 75c9d59804

Change-Id: I028982b0c4189ec7e384229e490907ed23e68f52