Merge "Merge "Changing default limits, clarify flags, fix bug." into qt-dev am: 44bb9d7f am: eb4e6165" into qt-r1-dev-plus-aosp