Update from upstream

Change-Id: I8affdf79e5a2f33c88f7661082d2cbd7777240fb
Merge "Update from upstream"