Merge "Simplification of code to prevent a Log.wtf in expected cases." am: 3cc6f6627f
am: fbc68b975a

Change-Id: I5f5fa22468c8db09e4eeb3d446220b4ebc396d98
tree: fe971564beedc2ceba179bec4513f4797da4f1fb
  1. core/
  2. services/
  3. tests/