Real Fix to totation bug

Change-Id: If45c17a2840557da7774f38c288376458ac87224