Prepare for 3.31 builds atop 4.29-I-builds

Change-Id: If1c16be23fbb80d592334af2d50dcf70e618f76e
6 files changed