Merged wrong version of patch

Change-Id: Ibeb1befb0001f6f0e24fea4a8f4154cb98697441