Patch By: Tsutomu Uchino
Review By: jsc

(cherry picked from commit d56225de)

Change-Id: I91ea7add253a5c40272ee112d207fcf510cd3935