Update from upstream

Change-Id: I376b19a7c686de2769ee64f4fc8258c4b0ceec1f
Merge "Update from upstream"