Merge "Make min/max sampling rate configurable" into qt-dev am: 23645e203a
am: b7913742e8

Change-Id: I5d50dc26beb1e5eb9b0e7dcb5f9afd80c790b446