Merge "Avoid potential non-terminated string"
am: 0a59152418

Change-Id: I4123445938ed7da2df9dc2c25a30552c01a799d7