This reverts commit 6ff939a8. Reason for revert: Used stated data Change-Id: Ib186d80dc23575278e4a58080f5ca4a555d3a2c1