Merge commit 'cde2350df5bfcf8ed8cce5f7df978a25ca6829b7'

Change-Id: Idcbfbcb65e518a64ff0f4dbc3a618ca37cca1e4c