Fixes bug #1083591 Change-Id: I162705a622c24090ce54eb7f12a65d96874611a7
Change-Id: Ie9b834cb2b9616273db004fd56cfec5c343b1551