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

Change-Id: I7d26fb2a217669e43c1a340ab1e2383162d6cc0b