Update from upstream

Change-Id: I2071ee8143e040c552f56f204e863c7dc90da872
Merge "Update from upstream"