FlattenableUtils::align memsets am: e62a9d7669 am: 59e7d4e8ea am: 3f273f49f1
am: f7724dfcfb

Change-Id: I0ecdb9a58418d0c65629c70fc6df2a4aad7a1784