Merge "Fix videoStateToString for audio/paused state." am: 89e7a888be am: 2f96f34373
am: 9b59cc7bad

Change-Id: Idee131069636fc8a4ea086a3d41bce4c1dfcbda6