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