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

Change-Id: Ie24c764582eccec4124dcb51c6b24dacf675b072