Merge "Temporary fixes for sizes and mangled names."
am: c7eaa1e34c

Change-Id: Ifa2f8b6905aa9d22c9468d0d07ca7afa21699b91