Bug: 30096512 Change-Id: Ic2ab61e891bead6f6e8f13d9ac311ead8fecba5b (cherry picked from commit e40b4d34)