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

Change-Id: Ia4e25d38e7e0085cac76708ebc83465d3a867546