Snap for 11619363 from 0765ed98de9964dc19f831dbc3848480bcb586b6 to mainline-rkpd-release

Change-Id: Ic7f44d57d7dad1807061c7231f14713f9cbaea11