Fix compile errors after merge. am: 52f1e4631e

Original change: undetermined

Change-Id: I98c0cf0a2ec1e8086c7f9d4a4773387ee931bdf0