Merge "Make kitchen sink send a bundle, and log it from the sample cluster." into pi-dev am: 823c5d6c25
am: 6e0b83e963

Change-Id: I096caafe452f3f54ec869c694c2f58af45faf733