Tweaking clings again to support smaller folders (Bug 10965184)

Change-Id: I324d770fafd7db5d66a870f7825caeb6440ac467
3 files changed