Bad cherry-pick fixed.
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I34e39cad81757364e97dfc0a11ed847af05cf382