This version contains a fix for -Wstring-concatenation error. Test: presubmit Bug: 175068488 Change-Id: Id4f2ae49da91a481ab2625fdf17668689b640794