DO NOT MERGE fix build
am: f453a488cb  -s ours

Change-Id: Ib299fb1c949b113078ac04ec54d9f4305524f197