This reverts commit 94d465dc. Reason for revert: Breaking the build Change-Id: Ic6ec025faee11075d976fd67c5bcd19167e87a00