Match upstream changes

Change-Id: I168d32cea9d3aa654dbfe82942c19d4544bc888c