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

Change-Id: Id7ca0a8a930e3abfd7edd3a5f192ca478de51a34