Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 am: cc3287ef42 am: f8d3ded044 am: 8279621b82
am: 57f76df8d7

Change-Id: Id97dd0e8e943144292e426f772997d791b2d5a3f