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

Change-Id: I0d51ef04b0641889117054cc36499acdbac83220