Just Commenting these out for now

Change-Id: I91591fa166e508afded485ec86e887ede2b4e8fe