Fixed clear-all button Bug reported via G+

https://plus.google.com/108241510641277726616/posts/C7nbp9bQi7X

Change-Id: Ibd0abf2493fb8e3bcbabdd917a61ab77e522b662
Merge "Fixed clear-all button Bug reported via G+" into du44