Fix: 31331663 Fix: 32466757 Test: Signature change only; checkbuild. Change-Id: I361cdd43b9fccf309ff3efefa3783d5399e65748