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

Change-Id: I55e5c90dd0b2c52a1cbee5d6be14a339157d6a75