This reverts commit 016db6e4. Reason for revert: Re-land the changes Change-Id: Ia4f61a5d4cc26e03c5b9319fa0df183ea706dfed