Signed-off-by: Jingwei Zhang <jingwei.zhang@intel.com> (cherry picked from commit f3ea093ebb) Bug: http://b/27533895 Change-Id: I5703f4e2189bb1d12d8864757d72a327f17a74f9
f3ea093ebb