Fix custom platform abstraciton after merge

Change-Id: Ie5f634aeca7c9af3b0f5233c5c5084713e6ea8a9
Merge branch 'cm' into HEAD