Rebased.
Signed-off-by: NRob Clark <rob@ti.com>
Signed-off-by: NInki Dae <inki.dae@samsung.com>