clear comments (stable version 0.9.5.6)

Change-Id: I3c1c97213e95bcad9387806403ef011585dabe50
Merge "clear comments (stable version 0.9.5.6)"