(bug 48011) notlimit parameter does not accept "max" as a value

Change-Id: I6bb7272b5a3df5fe9ccd3cf78a24769ca38a3f20
Merge "(bug 48011) notlimit parameter does not accept "max" as a value"