FlattenableUtils::align memsets am: e62a9d7669
am: 59e7d4e8ea

Change-Id: I1105027b52c3621e2031bdb747de61ce54d3ec74