Change-Id: I1024f2a56badde5c123d025d6fe02f42559cbcb1 Test: manual Bug: 30352311 (cherry picked from commit f6f1d627)