Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev