Merge "Changing default limits, clarify flags, fix bug." into qt-dev am: 44bb9d7f6b
am: ac7c257992

Change-Id: I1d33f2b56652b6479e1da476c1b6190be4e84929