Merge 59803d5f4ebe4ee6c852f48888936807a74d2b80 on remote branch

Change-Id: I312c7894a24b52e067b93d2ac67e7701d441115d