Snap for 9087993 from e391f2917ab732da31375fe5b984470159af0d0f to gki13-boot-release Change-Id: I7de8297142dbfcafdd7a83f1eeb2876f6e7cabb3