Squash *+, *?, +*, +?, ?* and ?+.

Change-Id: Ied7dd7fb2e718cdf397b4dc4167ab622a9dbdc01
Reviewed-on: https://code-review.googlesource.com/11132
Reviewed-by: Paul Wankadia <junyer@google.com>
5 files changed