Merge "Fix RemoteViewsTest"