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

Change-Id: If9ac959f83de3627ff9950ee727acb3ab07c7b9c