DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64  -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d  -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749
am: 5995e741e5

Change-Id: I8ad269b877b307eb104f7b749ad728b931dd0aa2