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