Bug: None Test: None Change-Id: I3e568a53aeca0b256eead942f8d2fe6c50ff1ada (cherry picked from commit bd7dfe68)