tiny cleaning (v 1.5.3)

Change-Id: Ic32d402af9d96d4c58631b72fd2b94fff113029f
Merge "tiny cleaning (v 1.5.3)"