Bug: 17288973 Change-Id: I2808eee58cbddae1b16fbe19a715b72d6dbaaec3 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>