Merge \\"Install jack-diagnose\\" am: f555fbccc2
am: 3410bf966c

Change-Id: I1450c88db5a43dd84e117c0e3b41a69fcc705deb