Fix resolution once and for all by using CM arrays

Change-Id: I395c3260de9e6fd848f592a70a26c09940ab2f00