Update from upstream

Change-Id: Iffdeee461ebbda9e010941a97fe49c7bfd77a6c9