MP targets 31 (except in master)

Bug: 211369576
Change-Id: I91a710f0162de2843225b6f35bf8ca5cd144f934
Merged-In: I91a710f0162de2843225b6f35bf8ca5cd144f934
Test: no
1 file changed