Merge branch 'refs/heads/jb-4.2.2' into Testing
Fix compile error.
block: row: hardcode values research by the community

Change-Id: I1eb34c2168f40c829cff0a4244c5fc16b5200ae0
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
Merge branch 'refs/heads/Origin' into Testing