Merge 46c6eb7b7a4cff9bd420eeb63838580def00ca09 on remote branch

Change-Id: I9cbfb482fca556478669eac208ed25fa0128451f