This reverts commit cd1d91d9. Change-Id: I489917eff3919afb3388eaee7695c56655708c2d CRs-Fixed: 2582497