Merge ed1e2f0b9d009c0bab0f2987a1aaba5c45bc77b8 on remote branch

Change-Id: I1a8f9aff9aa73be8b6e1ba2bb5f57cbfdf6e6f73