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

* commit 'c91499842fed63c55326e7e2a71b491f7c9315c1':
  Prevent NullPointerException in getStringValue if no value is set