Commented out build breaker lines

Change-Id: I20811f3b417e2a0087df8dda8b3348fe3af9af5f