Merge "Revert "Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c4223e1d0...""