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

Change-Id: I9d7692ab98f4e834b27947ee13cb14460d9b5c57