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

Change-Id: I7253344ece9d28b8573b6f1cbf2652b2c06c3e7e