Fix for plan patch

Change-Id: I710553c86cb53d2fb0269168c9894f4d97e60e87
Merge "Fix for plan patch"