Synchronized with snapshot releases again

Change-Id: Iab5f648863690721657b2be24872c52b47b35eea
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Synchronized with snapshot releases again"