Merge "Remove incorrect forward declaration" am: 50d06c8849
am: 156c5f3fe0

Change-Id: Ib66a96d28efe52b776a4a69989d379f91609a58a