(Imported from upstream's b85d461cdf) Change-Id: I85f620a5a924c3fe73aa394b39ab8ab343c4c7eb
b85d461cdf