Merge ea5127ca58d684361c9020cc0fbbe423472fc6cd on remote branch

Change-Id: I6cb611c7b47184c8e7c96367173e426004f556ae