Small code cleanup in folders, prevent crash issue 5082899

Change-Id: Iccd4a1367f895dac7925ceae7cd7934b95e81474
2 files changed