Snap for 10453563 from 8982eba262b52c8300d51876574f8b86951434fa to mainline-rkpd-release

Change-Id: I842baf5064e9831f740f25c3b3d33add228b7650