This reverts commit 6dd33293. Interestingly fails for sdk build. Change-Id: I28d8fc05575ff1d744b4a831c32ef4414775561a