Merge "base: add ScopedLockAssertion." am: 3777d9cc10 am: 379b6f403f
am: f01d33b9e8

Change-Id: If81cf0d25621d6f733b39823d6b6dbc774a37150