Merge "Temporary workaround for ACM installation failure"