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

Change-Id: I110332586cc03159dc934dec967dfb6b0484fe9f