Add back code missing from upstream merge

Change-Id: I7c2f08ed1b9c7462feabe1ad793af4ddc55aff1b
1 file changed