Merge "libdm: improve ParseStatusText() and test it" am: 1553cf829a
am: 98417b72fa

Change-Id: I970e02e5f20cd1363eb37cbf3717a4de2e0597e6