Merge "Fix csi_x86 build failure" am: 32181a0ba4 am: 754ecb765b am: c2b390f200

Change-Id: I18f34af699f9abb0203ea4fb9b1d27c3edd76854