Break up lock into I/O and non-I/O

Bug: 259323318
Change-Id: If2a770c0c7cb70c7d08cd3d2ad073c6be1e569df
1 file changed