Fix build
am: 48caffe6fe

Change-Id: Ib1aa7ab1b874bbf44a90f8a1d8d36bbd8d242a88