togari: merge sony 4.3 changes

Change-Id: I60b970fa5ad9eb23bbb27fe45df107e00d5841d7