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

Change-Id: Ibfdfc0bb30a76cec2ce788fab20b8b1a64f6fbc4