Merge "Remove usage of deprecated makeImageSnapshot parameter Test: Does it compile?"