(cherry picked from kolla commit abc4f7c124265f9e7b72d448b2ef18d6d4e84888)

Change-Id: I7e51a76287cd0f5a22d11dc3af9284b556d06eca