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

Change-Id: Iee50e8ccfebe681c548486dffd07fc65c064c76b