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

Change-Id: I0c61ba82c25bc5afe0a5119ef1a7b2a6e0f0943b