Fix build break due to automerge of 7d2198b5 am: baae57ab am: 009e0811 am: d6a5f68f am: a81dd677 am: ad004292 am: cc3287ef Change-Id: Ie67919fe79a9102b7bb5b0dd10f66816fdf03e81