Merge changes from topic "libdm"
am: b066bbebd1

Change-Id: I2e7c1c71c9c7e25797a79702ceeafe756f457d26