Change-Id: I41b0ce2a024d7cc850fb7a380c992167fa004e72 (cherry picked from commit 44286a37) (cherry picked from commit 3e9a4df6)