Merge "Introduce UpdateLocks - "now is not a good time for non-interactive OTA"" into ics-aah