Bandaids for master

Change-Id: If48be96f9a117aceca2f3841c0c2c5052b4e309f