Merge "Fix string reference usage" am: 55d36240dc am: 140c3b6202
am: 7edfcaaab7

Change-Id: I76ef6d22cf76dddeea53a7dc947f0cf9226afc0c