Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada am: ec988a1003 am: de3ef49ee7
Change-Id: I6db88b34802c1bbf2cf5298bd1126b8fa21a1f33
This commit is contained in: