Merge \"Fix test after rename.\"
am: 522da11a6c

Change-Id: Iefbef3b21a47951c736522079a780884308a4dc5