Reason for revert: Some tests failing even after a minor fix. This reverts commit edeba10d. Change-Id: I6407c9b489c016d19a12c28d1da0efa55ad554a7