Bug: 63004717 Test: vogar OsTest (cherry picked from commit c5307105) Change-Id: Iebf8b87ceec9591097d05e9cd522d81624182452