This reverts commit 53a452d1. Reason for revert: Broken build Change-Id: I4c1c6f2166c3729ef1916ad7c21e32599c5e692f