Merge "return -1 iff any file is updated" am: 98ca327d36
am: dd7058e907

Change-Id: I698958c037c0e850f1df8821a013f11eaef9e73f