Merge be64d9c86c294c4169e58b57d82414bfb2e1d528 on remote branch

Change-Id: I41c5e92b0158399327f8a3497596315cf42c55ca