Merge "Fix a theoretical NPE" am: c312053b39 am: 668661d94c

Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193