Fix for: b/16685592 Change-Id: If15951ee783e8c05b4dfb32983a87a3518cdbe82
Change-Id: Ife3a9a64439e07aaaf92a22adc6d1678138caf7d