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

Change-Id: I657f5a39f505ee51cb9eb5b425f31beed385bcb6