Fix build due to merge issue

Bug:28388969
Change-Id: I7be1ef05b3533762d51d9d26f3aad36a331fc470
1 file changed