Merge \"Remove stray end of macro.\"
am: ed22d481c1

Change-Id: Ie0fd2541f467d2353ef680ff5c905eae7b6f1c70