am 2b69b70d: am c5b6ac72: am 2d7e7eda: Fix resource issue in folders of partner layouts

* commit '2b69b70d7cb2a1c67b527f094820fb3497a3709f':