Simple with cinder in one case

Change-Id: Ie2bda76d86b2dc5081ad6bb5359e4b6c0d96b2c2
Merge "Simple with cinder in one case" into stable/4.1