Snap for 8992082 from ed00fdde8d205a82ca86b68496dd1d062ca8f0fd to gki13-boot-release

Change-Id: Ic9b0c0213071e906f0878e3ee03861ff30031b6d