squash with add input

Change-Id: I79ba4b78683a582a12a0111dcd6f29bc1b8b257f