Merge "Add SIZEOF_MEMBER." am: 1e4764e90c
am: 689cd77bd1

Change-Id: Id14f9a930885d8bc03e6858a296d47421bb25529