Merge b44cdad94e032c8e9f6fae65251e7166c8100e9e on remote branch

Change-Id: I9c7e9422351bb2710b46c38fe782780d9223d1f8