Merge "Fix weak vtable warnings" am: d93a40c920 am: 11a2bcad06
am: cd77a5a218

Change-Id: Id487011570e506e49a23a793b13e3a173c618a4c