Merge "Do not warn about uncommited files if sha is set explicitly." am: f32000dda2 am: bf406fd592
am: f3637cd006

Change-Id: I159069f7a733d091721a28568a4f88863c866a27