Merge ea82371268725f6428808f84546eef1752f572a7 on remote branch

Change-Id: I6490419a7af01f7bb512346605db86b0d357cc2e