Update from upstream

Bug: 43904
Change-Id: I34e8ad3e82ffa23f03b5ddf25e92d850991abb43