RECONCILE SOME BULLSHIT DIFFS BECAUSE SOMEBODY BROKE PLAY MOVIES AND IM ON A FUCKING PLANE.

Change-Id: I5ccce4ca0e3827ff8c96ca30dcf9edd03e2e6ecb