Merge "Add accessibility timeout video and illustration" am: 1595fc8fc8
am: 95d21e0d44

Change-Id: I888cae4271d525f7cd9a02b9ffb494544409a5c9