Update composer loading so users can disable repo or client

Change-Id: I5a9c0a29f939c651e546c10209096c658c15527a
Merge "Update composer loading so users can disable repo or client"