This reverts commit 9e38935f. Reason for revert: Nightly test issue. Change-Id: I68af7380bd5aa3f9be8363b52b261b1cf310cd59