Merge changes from topic "base_cmsg" am: 8954d0bc98 am: b1ca42ae28
am: 8f1cbd47fe

Change-Id: Iadf654700aac1a2892536c262f0fe6203c9beab1