Bug: 339748167 Change-Id: Ic3b3ba6fa6192fc19070808ce263a957691bcb41 Signed-off-by: Darren Chang <chihsheng@google.com>