Merge remote-tracking branch 'origin/reading_room'

Conflicts:
	.idea/libraries/support_v4_19_1_0.xml
	build/intermediates/model_data.bin