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

Change-Id: Ib644bc77055c492207ae0fb09c84122fea713719