Merge "Fix a stupid NPE" into rvc-dev am: 18eb7e5570 am: 007bff06ea am: 3a52d0f78c

Change-Id: I55984c5559cfcb8a497cdc7549d079d3a2d4063d