Merge "Add minimal support for Dwarf 5." am: e44bf1a4a2
am: b0f5022fad

Change-Id: Ib6ebe447f753ab67442ec63158bea9c52d657dfa