Fix build break due to automerge of 7d2198b5 am: baae57ab24
am: 009e08116f

Change-Id: Ied1bf21ec09d9774bd0f12d2688244fe7dc2bd80