Merge "Dump debug information for apply_patch unit tests" am: fe527cced4 am: 943c2057ad
am: 4388c79242

Change-Id: I99fc80d1679752dbc4c97df5f18d08b635fe256f