Here, let me repair YOUR devices FOR YOU (golden+skomer)

Change-Id: Ifb2f66d7920a68d8f2f02f301915a5e50ef23d8c