This reverts commit 489a632e. Reason for revert: Build broken Change-Id: Ic55440b0648cea1b67cb9e5691ae9b1be7d0ae0c