Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE