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

Change-Id: I4af9a022ab1836075d867c7d9e1e61834265a2ef