Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252

Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193
tree: 5fc687e64ffa3beb387e0f8438404de97890273f
  1. core/
  2. services/
  3. tests/