Merge "Add missing telecom locks."
am: 09a13977af

Change-Id: Ifc6c9c61c1497f9058c890ea156feba8051a8c7f