Optimize the directory structure of the resources folder Change-Id: I34893e2c622254df8d4b94ef11352ef7e97f9418
Fix folder name to avoid docker build failure Change-Id: I810e948e46698f4acd92b1c3da7e7b200fa8a7dc