1f0bf69e16
Contributed by Masatake Iwasaki. Change-Id: Id74b90eb7cfb9d676188fc5aa47249ee8904a3d5 (cherry picked from commit 79f6118dccf809aed74dd54f46f5d77416e14aa1)