Groundwork for u8860

Change-Id: Ie8d6b3d86989e49a835f1291424d67ffdc825fd4