Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34
am: 319961f7c4
* commit '319961f7c4910bd3942fc52b4911a7274939c7fc':
Change-Id: If4f198eeb3e61d3e5cd97f74707350d2cfe091be
This commit is contained in: