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

Change-Id: Iebbc3f973b482387431e2110103cf2db671bbfef