This reverts commit 8f62a17c. Reason for revert: The revert of commit 5c228d5 was reverted Change-Id: Ibcd45987cd4c4fa94c3809bf7a509038d3bff40f