Merge "Camera: update test per interface change"