This is a patch from what've been converted internally. Change-Id: I19e50e65e7df90393c60c2a7f89edfafc79a5e02