Merge branch 'stable-2.11' into stable-2.12 * stable-2.11: Organize imports Change gitiles:gitiles target visibility to public Change-Id: Id485f7edb255bf0cc426c44f24572196d6c4c181