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

Change-Id: I14229c073811c3f36e39e968ee518690b017a654