Merge "Update build_broken_logs script" am: 49b445cace

Change-Id: I5962efed46aed54c2488f31181263a1e235a469a