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 am: eb7e711571 am: 97b3a2f578
am: 12622871bc

Change-Id: Ic05b9a77dde3a8b58a8cfbbbb0c41da56fd3494a