Merge "Remove unused hidden API UpdateLock" am: f8e08d814d
am: 84fa2d7a66

Change-Id: I4219f106cefae5da14e2e405247020206a3a3b07