Merge "DO NOT MERGE leanback: fix broken VerticalGridView RTL layout" into oc-mr1-jetpack-dev
am: f8aafdbcda  -s ours

Change-Id: I63b341746e85eef6b2f1e619d4a550ebdffbb651