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

Change-Id: I29a12e5b361dd4f145daf2eef98bc59adb0f91b9