9bcd361617
In addition, a local variable was renamed to avoid confusion. Change-Id: Id4c497f9cfa219e8a414aa9fee9a85af5f147249