Snap for 8269078 from bf043b21279859690beb16a00b1fb385b0d9754a to gki13-boot-release

Change-Id: I6dc6cad3e4214876bacd0a9161633ae75fbaa693