Merge "Splitting analysis window in frequency implementation. Other fixes."
am: 60c33d85d0

Change-Id: I8a654d0507ae0fb7a76fd1439645c2c3d2f71f8b