Change-Id: If58fdc2eaf1b7b2148e3db2ebba6f8c0f2e9c92b (cherry picked from commit 32d2fb8e) (cherry picked from commit e783fe7d)