Sync with patch

Change-Id: I987233a2dca5f88eb537b0a48fefb8ae89223d28