Change-Id: I70b43d668f905f236e18493c07ac6c369b7ca2d1 Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com> Signed-off-by: Jon Lin <jon.lin@rock-chips.com> (cherry picked from commit 4a942f49b891872727aa0bdba58e2ca513fc455c)