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

Change-Id: I8349115cf2b7678ac6e24ea2aa06ed59bffa5930