Merge "Fix a stale reference use."
am: b789d8966c

Change-Id: I9c167d5855862811e2aeef5b41fc741976a6159e