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

Change-Id: I57ac38379c69efc86d70448726ec5247cd770e12