Merge commit 'a5db06d'

This is the upstream commit for JavaPoet v1.11.1

Change-Id: I3372f7a59c8888b66930b67e73f8a9d3a6c51167