Patching on UI

Change-Id: If3f5775aad4f953d2c84ac38cc5b98ee8fb0359f
Merge "Patching on UI"