The existing code was behaving differently for the leaf view and its parents. Change-Id: I14c1ce5cc149ff840ad957408d6a41bbb4137264
The existing code was behaving differently for the leaf view and its parents. Change-Id: I14c1ce5cc149ff840ad957408d6a41bbb4137264