Merge c53a4e9b23f7201125298018300ebcd6b9eb78cb on remote branch

Change-Id: Ic334f5f389386f5174af4656b3a264e937cd4d4a