Merge "Move bypass default value to framework" into qt-r1-dev am: 839b7183d6
am: 29d08d0c84

Change-Id: I7dd92113ee6575e30f579fd62ad08fbbcdc687e4