Bug: 29579542 Fixes: 29579542 Change-Id: I4e122bd6972fde933229768cba86302eb4d3f7c6 Test: Added Robo test, manually tested