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

Change-Id: I3c5ac16e2a7cad533c7d8c8b0e611bd26743e875