Merge "Make getCameraIdListNoLazy handle no service case"