Merge 231b07b46b02a8e2b6fb57c225923e7289936728 on remote branch

Change-Id: Ie12853ab0f7f88acfe1f3ccc9e2aafc565852c4e
tree: 0aec4218c83cf55b93832ab7d82ac2de2387d1e4
  1. bindings/
  2. display/