Fix missing Credentials and align with cm source

Change-Id: If00815243bf80248db11dc1373c9baa218418a81