Bug: 26317072 (cherry-picked from commit 9c25dfaf) Change-Id: I786dae69b0680cf619368894842b21d39d64ab97