am f0ca90dc: am c9149984: Merge "Prevent NullPointerException in...
am f0ca90dc: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393
* commit 'f0ca90dc':
Prevent NullPointerException in getStringValue if no value is set