Merge "Fix null pointer dereference in RegsArm." am: 85d9e67361
am: 80e8231a0b

Change-Id: Ie7a3d60c5d8d4e2b9e4e5141f176d1e3e2e0457a