merge dd1d0016 to master

Change-Id: Ib83cd76a959fa6209f4920021d3dbf5d61fa6b8e