Merge "IFoo: remove pointer from u." am: 999693e4e8
am: 94955f45ca

Change-Id: I2c2b7d9ad777614ad216d4181332d53fa5027d90