Merge "Use guava 21.0" am: edb2e0c722 am: f1c99fb47f am: a119b38d9e
am: fde2fcaaa0

Change-Id: I6658192a8434d908dd237207fe6e6ab5e2dff08e