Merge "Revert "Snap for 6792834 from edbf3411d2c91f38a1a5d93b9e5b338052...""