DO NOT MERGE Fix build am: dfedca4e43  -s ours am: 499871ebe9
am: 3ea1f124f9

Change-Id: I6762900887ed8ec6afb5b787fc3a2426b846a6c1