Merge changes from topic "base_cmsg"
am: 8954d0bc98

Change-Id: If51ace5232566f43430a5fb31708a6b20fc4aba1