Merge ebbe122b55972390e1ded15e79a0f74119b6bcc4 on remote branch

Change-Id: I8c5de4bf0700198a62e8b100d97ce5d3c163abac