Update to upstream version 1.0.3 PR: 218288 Submitted by: naito.yuichiro@gmail.com Reviewed by: riggs