This reverts commit cb93d29a. Reason for revert: retry this CL with additional changes in topic Change-Id: Ibbb8926caef05c2177c06cb1c00795d407215f4a