Merge c46b50db3c8396a64352b8fdf0eb174d6967febd on remote branch

Change-Id: I0c4fb497f1aa2f145c8eb4f8803bca60789051f8