Merge branch 'upstream/master'

Bug: 102846
Change-Id: I013065b7e12ad8387d0b0f0fdc1c0a36c2fd0911