Merge "Fix string reference usage"
am: 55d36240dc

Change-Id: I9aa3118ba3497b2169f1acae24841a06e0f9455b