9363d91218
import of changes 22100 and 23138 from opensource. Change-Id: I3ce86394323d269272aeb2bebeed4374f171a8cf
import of changes 22100 and 23138 from opensource. Change-Id: I3ce86394323d269272aeb2bebeed4374f171a8cf