(Imported from upstream's b8d687bb56) Change-Id: I5155b8fa165fbb83a0ba6790571fec28e22cd45c
b8d687bb56