Snap for 10453563 from 6f3875a7c631777c3ce629036716cadaf42c3116 to mainline-rkpd-release

Change-Id: Ic5287abecebf6ea8abd1424e24037ea6079e971e