Fix Nightly Builds

Change-Id: I76e73b727af806b9bfebf104ad6b4d03d0b01417