Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE
tree: af6d867619e92bb04eaa78f11545d5ffa1a5b7ed
  1. core/
  2. services/