bug: 24540091 Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5 (cherry picked from commit 0b34f2a3)