c1905: updates for cm-11.0

Change-Id: I800f2bd17d27f9c91da85453077c210eddec6abb