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

Change-Id: I3729e40217f61fb6c5cb5d732ffb9ec52b06fa77