(Imported from upstream's 30b7d5e1d83a2f5cb862361c180f7ba1f31a20a5.) Change-Id: Icbcdb03bcaf8eddda1a7dfecc4f182ce6d93caeb