Merge "Add some input checking to prevent problems" am: 0efe4aa812 am: 5cfa78aac8
Original change: undetermined Change-Id: I92ab9339dd54960c3da7eb2d6fe0a64a8daad64c
This commit is contained in:
0efe4aa812 am: 5cfa78aac8
Original change: undetermined Change-Id: I92ab9339dd54960c3da7eb2d6fe0a64a8daad64c