Merge "Fix a stupid NPE" am: 30673a9684

Change-Id: I3a167339e4007e5cb16488e701b9ca16937da265
tree: cca6f427a13e2d3321fc5ab04812d1b1435758fb
  1. core/
  2. services/
  3. tests/