Clean up intent unwrapping.
Clean up intent unwrapping.

Signed-off-by: Dave Smith <bb533b618e78082aeb4dd41165d312e7410457ee@google.com>
Change-Id: I3216294b31a7d8fb119bfbc62de92b5dcfafe98c

googlecodelabs/smarthome-washer,googlecodelabs/smarthome-washer