ea363f4cf5
This reverts commit 18e170fca3.
Change-Id: Id8cd03e12751d80c366f9b04683ea6998bd62654
Signed-off-by: Victor Chong <victor.chong@linaro.org>