Fix build by adopting pa/2486525

Change-Id: I6b49f04578350ff8a8dd4c031aee289d1aac841d
2 files changed