Fix build am: 48caffe6fe am: 1da4542abd  -s ours am: ab486b087e am: 04b334a98d
am: f231e8b680

Change-Id: Ibe86820231c7c86aec093282fb7944abaa03b32d