DO NOT MERGE Fix build
am: dfedca4e43  -s ours

Change-Id: Ibf95b4c061129b2cd047e3b8a8da9f90cfea7e8f