This reverts commit 94d465dc. Reason for revert: Some build target Build break Change-Id: I51914d40b0b7197861b8ccfa4f2c70151287713a