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

Change-Id: Iecca7741001c7e4b60d8f698ef73ac0d9321b0e1