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

Change-Id: Iccbcf5b6c1227530b1198a33df4bf5080a6496e4