Change-Id: If09c39341833e6162921c280bcc7583cca2fb15f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>