This reverts commit d84e80ec99 because it depends on change I5235ae4368f8bff13c767b87ced83173d52b5155 which is being reverted. Change-Id: Icfda239538ff9d1ef663e32e6bc9695bb99b2dcb
d84e80ec99