Merge branch 'master' into OI2JIRO

Change-Id: I25e79eb9a832fafc47d9c7c3a6dae11fdb6f6fa0