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