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

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