FIX: 70332970 FIX: 73919570 FIX: 67495520 FIX: 71566404 Test: None Change-Id: Ic9b485ff7c15e0d244cba9e71def8d5c41e52070 (cherry picked from commit 8309c8f7)