Fix 3.1.5 build

Change-Id: I974cb877795ee1d54b6bae33fb09734a6432bd39