Merge changes from topic "bug123174577_drop_SizeOf" am: f2be4e478b
am: d681798283

Change-Id: I1e103e8bc87c30f53afba6fc53825b5220328c4b