Merge changes from topic "bug123174577_drop_SizeOf"
am: f2be4e478b

Change-Id: I16e42a6e695c1ce8d26aa61c464ce0b27db91771